added check to avoid removing referenced models #278 #333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fehguy
commented
Oct 27, 2016
| Map<String, Model> definitions = swagger.getDefinitions(); | ||
| assertTrue(definitions.containsKey("x")); | ||
| assertTrue(!definitions.containsKey("y")); |
There was a problem hiding this comment.
Note that y lives on, even though it is directly referencing all aspects of z
fehguy
commented
Oct 27, 2016
| assertTrue(!definitions.containsKey("y")); | ||
| assertEquals(((RefProperty) ((ArrayProperty) definitions.get("x").getProperties().get("children")).getItems()).get$ref(), "#/definitions/x"); | ||
| assertTrue(definitions.containsKey("y")); | ||
| assertEquals(((RefProperty) ((ArrayProperty) definitions.get("x").getProperties().get("children")).getItems()).get$ref(), "#/definitions/y"); |
There was a problem hiding this comment.
Instead of changing the reference to x, I'm leaving it as modeled as y
|
OK I've reviewed the behavior with a few others and this PR and test changes seem correct. We don't want this: to remove the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #278
@diegode this is to fix the issue in #278 but...
I don't necessarily agree with the expectations in a couple tests. Once I fixed this bug some other test failures appeared.
For example, when we have this:
That the parser should change the definitions to this:
Because a model is referencing
yin this example as a property, there may be intent and value in retaining that name. So even thoughyabsorbs all the properties ofz, the nameymay be useful.So this PR changes the behavior of a couple tests that were previously behaving differently. Since you put them there, I thought it was only considerate to get your feedback before any merge :)